EndSessionDialog: Add a Close method

When there are multiple sessions, we may get a polkit dialog in
response to clicking 'Reboot' in the end session dialog. If the
polkit dialog gets canceled or otherwise ends unsuccessfully,
we are left with the lightbox that the end session dialog puts
up when 'Reboot' is clicked. To remove the lightbox and make the
session fully functional again, gnome-session will call Close.

https://bugzilla.gnome.org/show_bug.cgi?id=688915

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 57a7dcdb367a1f69b782448b238f70b730c9486d..59fbae29558d256399fbd42f9e724270a69e16ed 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -50,6 +50,7 @@ const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessi
     <arg type="u" direction="in" />
     <arg type="ao" direction="in" />
 </method>
+<method name="Close" />
 <signal name="ConfirmedLogout" />
 <signal name="ConfirmedReboot" />
 <signal name="ConfirmedShutdown" />
@@ -488,5 +489,9 @@ const EndSessionDialog = new Lang.Class({
                                         invocation.return_value(null);
                                         this.disconnect(signalId);
                                     }));
+    },
+
+    Close: function(parameters, invocation) {
+        this.close();
     }
 });